Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Dec 2011 04:17:47 +0000 (20:17 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Dec 2011 04:17:47 +0000 (20:17 -0800)
commit908e54cf651a840830fb28943701a9ef9a282922
treeb67a816ed7d5541ae133719f8916ed22aa42f385
parent9b67cd5b41a35f12c6bad1ad984faf44ea940920
parent3be055a6e1b43428077d366ab4cebf1878e4edb9
Merge from trunk.